From a1d451b71fa5b2dadff7c9330e81487d7750bb08 Mon Sep 17 00:00:00 2001
From: Julien Grall <julien.grall@arm.com>
Date: Tue, 12 Sep 2017 11:36:16 +0100
Subject: [PATCH] xen/arm: traps: Re-order the includes alphabetically

Signed-off-by: Julien Grall <julien.grall@arm.com>
Acked-by: Bhupinder Thakur <bhupinder.thakur@linaro.org>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---
 xen/arch/arm/traps.c | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 7f6ec15b5e..6b3dfd9bcf 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -16,41 +16,43 @@
  * GNU General Public License for more details.
  */
 
+#include <xen/domain_page.h>
+#include <xen/errno.h>
+#include <xen/hypercall.h>
 #include <xen/init.h>
-#include <xen/string.h>
-#include <xen/version.h>
-#include <xen/smp.h>
-#include <xen/symbols.h>
+#include <xen/iocap.h>
 #include <xen/irq.h>
 #include <xen/lib.h>
 #include <xen/livepatch.h>
+#include <xen/mem_access.h>
 #include <xen/mm.h>
-#include <xen/errno.h>
-#include <xen/hypercall.h>
-#include <xen/softirq.h>
-#include <xen/domain_page.h>
 #include <xen/perfc.h>
+#include <xen/smp.h>
+#include <xen/softirq.h>
+#include <xen/string.h>
+#include <xen/symbols.h>
+#include <xen/version.h>
 #include <xen/virtual_region.h>
-#include <xen/mem_access.h>
-#include <xen/iocap.h>
+
 #include <public/sched.h>
 #include <public/xen.h>
-#include <asm/debugger.h>
-#include <asm/event.h>
-#include <asm/regs.h>
+
+#include <asm/acpi.h>
 #include <asm/cpregs.h>
-#include <asm/psci.h>
-#include <asm/mmio.h>
+#include <asm/cpuerrata.h>
 #include <asm/cpufeature.h>
+#include <asm/debugger.h>
+#include <asm/event.h>
 #include <asm/flushtlb.h>
+#include <asm/gic.h>
+#include <asm/mmio.h>
 #include <asm/monitor.h>
+#include <asm/psci.h>
+#include <asm/regs.h>
+#include <asm/vgic.h>
 
 #include "decode.h"
 #include "vtimer.h"
-#include <asm/gic.h>
-#include <asm/vgic.h>
-#include <asm/cpuerrata.h>
-#include <asm/acpi.h>
 
 /* The base of the stack must always be double-word aligned, which means
  * that both the kernel half of struct cpu_user_regs (which is pushed in
-- 
2.30.2